Autogenerated HTML docs for v1.5.2-rc2
diff --git a/git-diff-tree.html b/git-diff-tree.html index e3d8b69..f2ba31c 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -1277,6 +1277,46 @@ in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.</p> </div> +<h2>diff format for merges</h2> +<div class="sectionbody"> +<p>"git-diff-tree" and "git-diff-files" can take <em>-c</em> or <em>--cc</em> option +to generate diff output also for merge commits. The output differs +from the format described above in the following way:</p> +<ol> +<li> +<p> +there is a colon for each parent +</p> +</li> +<li> +<p> +there are more "src" modes and "src" sha1 +</p> +</li> +<li> +<p> +status is concatenated status characters for each parent +</p> +</li> +<li> +<p> +no optional "score" number +</p> +</li> +<li> +<p> +single path, only for "dst" +</p> +</li> +</ol> +<p>Example:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre> +</div></div> +<p>Note that <em>combined diff</em> lists only files which were modified from +all parents.</p> +</div> <h2>Generating patches with -p</h2> <div class="sectionbody"> <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run @@ -1468,7 +1508,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 14-Apr-2007 16:21:44 UTC +Last updated 06-May-2007 08:52:35 UTC </div> </div> </body>
